* (bug 7582) Add 'tog-nolangconversion' to MessagesEn.php.

  This key is need for languages with variants (zh, sr, kk)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 81b043a..043c4ad 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,6 +74,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   FIXME: this may leave doubled rules which won't stand up to certain changes.
   Will want to adjust these more to eliminate the dupe @includes.
 * (bug 7607) Add Karakalpak (kaa) to Names.php and stub message file for linktrail
+* (bug 7582) Add 'tog-nolangconversion' to MessagesEn.php.
+  This key is need for languages with variants (zh, sr, kk)
 
 
 == Languages updated ==

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 8cb7913..abf9072 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -121,6 +121,7 @@ $messages = array(
 'tog-forceeditsummary'         => 'Warnen, wenn beim Speichern die Zusammenfassung fehlt',
 'tog-watchlisthideown'         => 'Eigene Änderungen auf der Beobachtungsliste ausblenden',
 'tog-watchlisthidebots'                => 'Bot-Änderungen auf der Beobachtungsliste ausblenden',
+'tog-nolangconversion'         => 'Konvertierung von Sprachvarianten deaktivieren',
 
 'underline-always' => 'Immer',
 'underline-never' => 'Niemals',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 769d3d6..c0a5241 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -369,6 +369,7 @@ parent class in order maintain consistency across languages.
 'tog-forceeditsummary' => 'Prompt me when entering a blank edit summary',
 'tog-watchlisthideown' => 'Hide my edits from the watchlist',
 'tog-watchlisthidebots' => 'Hide bot edits from the watchlist',
+'tog-nolangconversion'         => 'Disable variants conversion',
 
 'underline-always' => 'Always',
 'underline-never' => 'Never',